merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 14 Sep 2011 00:47:13 +0000 (09:47 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 14 Sep 2011 00:47:13 +0000 (09:47 +0900)
commit029424997ad946add6762eba3c8042383a84579e
treef5ef2e1cc07cd4461ef664fcedebbba2637d4470
parent888e3b8c2468e9058aa47ebe415a2a7d58dbc975
parentd1bb650b61418e3aefaf34d49e81bd655cff7161
merge trunk